Skip to content

Sync with upstream @ 1dce5b72 #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 747 commits into from
Closed

Conversation

javascript-translate-bot

This PR was automatically generated to merge changes from en.javascript.info at 1dce5b7

Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.

Alternatively, you can close this PR and merge conflicting changes manually.

The following files have conflicts and may need updates of the translations:

Click to open a list of 137 files

To merge changes manually (instead of merging this PR):

  1. Add remote upstream that links to the English version (only needs to be done once)
    • git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
  2. Commit all current work locally and git checkout master
  3. Pull the recent changes from the English version:
    • git pull upstream master
  4. Deal with the conflicts. If a conflict touches a few lines, then just fix it. Otherwise, following commands can help:
    • Checkout your (translated) version of a file/folder at the given path (removes all upstream changes):
      • git checkout --ours <path>
    • See the diff, what changed in the upstream file since branches diverged:
      • git diff --word-diff master...upstream/master <path> (please note: three dots in the command)
    • Then you can examine the changes in upstream and add them manually
  5. When conflicts resolved, commit them and git push origin master

Please ignore changes in README.md (git checkout --ours README.md && git commit -m ignore README.md).

This PR will be closed and replaced with a new one in a few days.

Sorry, something went wrong.

iliakan and others added 30 commits September 20, 2022 13:52

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix typo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Minor grammar

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Minor grammar

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
👾 add mdn links to Map and Set methods

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update task.md | Fix grammar

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update String type chapter

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
fix markdown syntax

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update solution.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
typo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Missing '()' invoking a constructor.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
fix typo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
I don't see anyone using vice verse with "-" in between, so decided to remove it as well.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
contextually 'true' can be confusing after 'false' in sentence: "... false, technically that's true ..."

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Parentheses can be omitted even if the constructor function has arguments:
```js
new function(test) {
    return { test }
}

// Works the same as
new (function(test) {
    return { test }
})();
```

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
smith558 and others added 23 commits July 8, 2024 09:13

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Update article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
* Remove BigInt IE incompatibility part

As Internet Explorer was retired years ago, this paragraph is not needed anymore, so I deleted that line.

* Delete link to MDN BigInt compatibility table

Unimportant link: almost total compatibility since the appearance of zhe `BigInt` type.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
detail `Math.round` behavior on negative numbers in middle case.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Update article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Inappropriate code `run`

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
change example element of multidimensional array

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Fixing a minor grammatical typo in the document.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
The code uses the function named 'askPassword' but the text above it explaining the error reason says 'ask' instead of 'askPassword'

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
minor fix to function name written in explanation

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Suggested edit - to make the phrase clearer.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
the comment number is missing when the we mention line 2

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Improve readability

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Grammatical fix

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Update article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Update article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
better wording

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Correction of grammatical error

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Update article.md
@CLAassistant
Copy link

CLAassistant commented Feb 17, 2025

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
4 out of 19 committers have signed the CLA.

✅ 0xtoorich
✅ iliakan
✅ Alexandre887
✅ kricsleo
❌ smith558
❌ Filin3
❌ nakhodkin
❌ sneeed
❌ ellie-heidari
❌ pvepamb1
❌ tonybishnoi
❌ shallow-beach
❌ FloffyGarlic
❌ zakingslayerv22
❌ AdityaGirdhar
❌ mhi1627
❌ nikoandpiko
❌ pj-szdm
❌ Gleb-Pastushenko
You have signed the CLA already but the status is still pending? Let us recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet